Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🌱 Bump github.com/coredns/corefile-migration to v1.0.25 #11651

Merged
merged 2 commits into from
Jan 13, 2025
Merged

🌱 Bump github.com/coredns/corefile-migration to v1.0.25 #11651

merged 2 commits into from
Jan 13, 2025

Conversation

chrischdi
Copy link
Member

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

/area dependency

@k8s-ci-robot k8s-ci-robot added area/dependency Issues or PRs related to dependency changes cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 8, 2025
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 8, 2025
@chrischdi
Copy link
Member Author

/cherry-pick release-1.9

@chrischdi
Copy link
Member Author

/cherry-pick release-1.8

@k8s-infra-cherrypick-robot
Copy link

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.9 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot
Copy link

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@chrischdi
Copy link
Member Author

/retest

@chrischdi
Copy link
Member Author

unrelated flake

sbueringer
sbueringer reviewed Jan 8, 2025
View reviewed changes
go.mod
@@ -7,7 +7,7 @@ require (
github.com/Masterminds/sprig/v3 v3.3.0
github.com/adrg/xdg v0.5.3
github.com/blang/semver/v4 v4.0.0
github.com/coredns/corefile-migration v1.0.24
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's also update the docs referring to CoreDNS versions (i.e. which version which CAPI version supports)

@chrischdi chrischdi added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jan 13, 2025
@sbueringer
Copy link
Member

Thx!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 13, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 5dd98fda698740068d768431e19fa7d9f91b339a

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 13, 2025
@k8s-ci-robot k8s-ci-robot merged commit 674e774 into kubernetes-sigs:main Jan 13, 2025
20 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.10 milestone Jan 13, 2025
@k8s-infra-cherrypick-robot
Copy link

@chrischdi: new pull request created: #11676

In response to this:

/cherry-pick release-1.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jan 13, 2025
Merged
@k8s-infra-cherrypick-robot
Copy link

@chrischdi: #11651 failed to apply on top of branch "release-1.8":

Applying: Bump github.com/coredns/corefile-migration to v1.0.25
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	hack/tools/go.sum
M	test/go.sum
Falling back to patching base and 3-way merge...
Auto-merging test/go.sum
Auto-merging hack/tools/go.sum
Auto-merging go.sum
Auto-merging go.mod
Applying: Bump coredns support in docs
Using index info to reconstruct a base tree...
M	docs/book/src/reference/versions.md
Falling back to patching base and 3-way merge...
Auto-merging docs/book/src/reference/versions.md
CONFLICT (content): Merge conflict in docs/book/src/reference/versions.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 Bump coredns support in docs

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@chrischdi chrischdi mentioned this pull request Jan 14, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@elmiko elmiko Awaiting requested review from elmiko

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

Assignees

@sbueringer sbueringer

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Milestone
v1.10
Development

Successfully merging this pull request may close these issues.
4 participants
@chrischdi @k8s-infra-cherrypick-robot @sbueringer @k8s-ci-robot